471 remove CodeClass from FilteredData
#964
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Code Coverage SummaryDiff against mainResults for commit: fda506c Minimum allowed coverage is ♻️ This comment has been updated with latest results |
gogonzo
previously approved these changes
Nov 22, 2023
| @@ -311,8 +311,7 @@ srv_nested_tabs.teal_module <- function(id, datasets, modules, is_module_specifi | |||
| ) | |||
|
|
|||
| hashes <- calculate_hashes(datanames, datasets) | |||
| metadata <- lapply(datanames, datasets$get_metadata) | |||
| names(metadata) <- datanames | |||
| metadata <- sapply(datanames, datasets$get_metadata, simplify = FALSE) | |||
There was a problem hiding this comment.
Please avoid taking anything except get_call and get_data from FilteredData - please take metadata directly from the data attribute
Suggested change
| metadata <- sapply(datanames, datasets$get_metadata, simplify = FALSE) | |
| metadata <- sapply( | |
| datanames, | |
| function(x) attr(datasets$get_data(x, filtered = TRUE)), "metadata") | |
| simplify = FALSE | |
| ) |
There was a problem hiding this comment.
It is a public method, though 🤔
There is a get_metadata function in teal with tdata and default methods. Perhaps we should use that?
There was a problem hiding this comment.
Oh, one more thing. On main this function looks like this:
.datasets_to_data <- function(module, datasets) {
checkmate::assert_class(module, "teal_module")
checkmate::assert_class(datasets, "FilteredData")
datanames <- if (is.null(module$datanames) || identical(module$datanames, "all")) {
datasets$datanames()
} else {
unique(module$datanames) # todo: include parents! unique shouldn't be needed here!
}
# list of reactive filtered data
data <- sapply(datanames, function(x) datasets$get_data(x, filtered = TRUE), simplify = FALSE)
hashes <- calculate_hashes(datanames, datasets)
code <- c(
get_rcode_str_install(),
get_rcode_libraries(),
get_datasets_code(datanames, datasets, hashes),
teal.slice::get_filter_expr(datasets, datanames)
)
do.call(
teal.data::teal_data,
args = c(data, code = list(code), join_keys = list(datasets$get_join_keys()[datanames]))
)
}
No metadata handling at all.
There was a problem hiding this comment.
Maybe this just is a merge artefact?
There was a problem hiding this comment.
No metadata handling at all.
You copied the function not from main. On main .datasets_to_data looks like this:
Line 314 in 50bbab6
There was a problem hiding this comment.
My mistake. The function above is on refactor branch.
gogonzo
approved these changes
Nov 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Preprocessing code is no longer kept in
FilteredData$codebut attached to aFilteredDataas an attribute.Necessary adjustments were made in
teal_data_to_filtered_dataand inget_datasets_code.companion